Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 18 May 2010 23:23:58 +0000 (23:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 18 May 2010 23:23:58 +0000 (23:23 +0000)

Trivial merge